Changed two of the key and safe puzzles to toilet and npc.  Finished toilet puzzle and made new puzzle where you have to give something to him.