* more minor cosmetic changes