cosmetic and logic updates