bugfixes
new behaviors