fixes for activity time and calories

I don't know what I'm doing with github (it looks like it's re-pulling the previous change?) but here's another couple fixes for you.