Funhouse re added

Re added the funhouse as well as fixed a couple of the collisions.