Cleanup of sections 1-6

Added Jaime as co-author, made names consistent, incorporated Hannes
comments, added description, fixed copy/paste errors