a lot of little fixes