Bug fixes and behavior improvements.