Fleshed out more geometry and challenges in Evil Castle 2.  Not all switches are working properly!