wip
minor cosmetic changes