Fixed wrong velocities being calculated
Tweaks to resolutions