various cosmetic fixes