oh gosh, some more style fixes