Lots of fixes and version push to 3.0.2