[@Mr Allen J]
I think I have addressed a majority of the issues now but I'm unsure