Some updates and additions.