new behaviours, fixes and improvments