A bit of clean up
First ok version with version 6 complete.