fixed wrong speed and time calculation
- cleaned out some code in Timer