grab bag of fixes
small fixes