Update with recent additions and revisions