fixing warnings, missing behaviours