misc fixes and update