corrected bugs here and there
Merge remote-tracking branch 'origin/spinnman_register_listener_branch' into spinnman_register_listener_branch