misc fixes and changes