various edits, updates, corrections