some behavior improvements.