More cosmetic changes and updates