clean up some unfriendly defaults & logging