cleaned up some classes and changed webconfig