Bug fixes and more.