some cosmetic changes, mostly