More tweaks
fixed bug with resetting to INITIAL_POS