tweaks to movement rules