v8.0.06 First Commit

Fixed a few niggles, see the change log