various further edits
Merge of Aaron's homepage update