Added Wsgi class and tweaked a couple methods