minor lipsticks
minor lipstick and minor fixes