Fixed overthrust/underthrust problem.  Added more to Evil Castle 2 geometry.