More additions and revisions