even more cosmetic changes