Better movement, minor tweaks