Final Changes

This last pull request contains all the final changes.