Fix thruster control and direction changes
Fixed merge conflicts