A few changes and tweaks, specifically with movement resetting and configuration