Final Commit

Last tweaks and cleanup.