Added the last of the markup.  Made little fixes.