fixed up a ton of minor stuff but major as well