improved manual control
fixed deadlock in heartbeat sender :)
minor update