fixed a bunch of the small stuff