Final additions and changes.