Rearranged some Caves puzzles + minor changes