bugfixes with manual mode