Fix warning
Re-order function bodies
Added on-movemove functionality, make on-tick optional