Some minor bug fixes, fixed the speed counter reset