Cosmetic changes and logic updates