Sounds like you're making lots of progress! As he gets more experience, things will spook him less and less.