Some more refactoring
Bump up speeds to match normalized timestep