Lots more comments, logging messages, and line length updates