Lots and lots of comments; very minor cleanup