various cosmetic fixes
cleanup again