Added flexibility and cleaner movement

Some testing hotkeys are still leftover