misc minor cosmetic changes