made a bunch of little fixes