misc fixes and additions