finalise orm and behaviours review