Final Changes/Commits

Final changes and commits.