Testing and fixes
Tidy up