various minor edits, more links
Merge of Aaron's update