fixes to my part