Fixed shifts in commands
Compiles fine now...