Fixed some slight issues with manual mode.