misc fixes and updates