Update v 45 "Work on bugs part 2"