Some tweaks to actions
More debuggability
Try and handle disconnections