Update-7/28

Made the changes/updates requested in the TODO file.