Minor cosmetic changes and adding a few points to existing categories