a few cosmetic fixes