a couple logging fixes and revert commented out code