Cleaning stuff up, adding puzzles