some cosmetic fixes before sending out