misc fixes and touches