Bugfix

All kinds of tidying up
This file is still on whacked out Tabs.  Using sublimeText 3.