Fixed all the commands, again, for the third or so time

Yeah..... @Override, really should have made more use of it :S