Reduced compilation time by a lot and cleaned up stuff. This really wasn't quite ready for release.