Modified comments

I went through the comments and made sure they made sense, and adjusted
them as needed. Also added a few "TODOs"