Fixed some syncronisation issues
Fixed main timer never being stopped