Bug fixes and slight changes.