Re-do Arrays

and other stuff
See Extended

Removed various sections and tidied up. And should have fixed some
issues.