cleaned up a slew of tiny errors