Some bug fixing and changing of parameters in the behaviours.