fixed a bunch of stylecop stuff