Bumped version to 7.0.0, a few fixes and enhancements