Hi Leslie -
Regarding those one legged hops - are you being sure that your heel is all the way down when you land? If it hurts your calves, it makes me think you might be trying to stay on your toes more than is necessary. Just a suggestion!
As Cathe always says -
"You know you should...