some puzzles added
optimizations of makeup