updated comments with notes from @garrettr and removed the TODOs that were resolved.