Behaviors improvements

A bunch of small changes to behaviors. Too busy to document PR.