Update with my fixes part 1
update to my fixes part 2