Yes, there's a lot that needs to be done, thanks for pointing that out, I've noted it down