a way to fix that is Re-do the teaching and do it exacly how you want him to do it
so being that you want him to Pick up tools and put them in a storage box you would have to-
1. start teaching
2. Pick up the tool
3. put it in the storage
4.walk back to where you started
5. Repeat and Go!