Fix Wait command and speed move routes up a bit