Lots of minor tweaks and fixes and tidying things up for 3.0 release
3.0.0 release