* really minor cleanup and fixes
