Updates

Cleaned up
Possibly fixed service staying on until we force close it in pedometer
class