Update and lots of small edits.