fixes to behaviors