Bug fixes and additions.