misc fixes and style updates