fixed manual mode bug, small changes