Patch 7.0

Patch for bug and coding clean up