fixing a bunch of sloppy errors