Bug fixes and additional changes.