a couple minor fixes and various cleanup items