a lot of little fixes part 2