Minor edits, building toward post 1