grab bag of fixes/updates