tidy ups and fixes

Version 2.0