Fixing up comments: adding more information and making consistent.