Add more puzzles, minor touches