fourth commit, fixing a bunch of different errors, mistakes, etc