Changed to all G1 moves except for jogs.
Fixed crazy indentation