Added trapdoor, fixed a few minor things