Added many comments and tweaked the includes and some other odds and
ends.