Big Update

Everything baring traps have been added. Loads of other stuff included.