some cosmetic fixes