Fix push bug, minor changes to logging and removal of debug code
8 files changed