Bug fixes and efficiency improvements.