Trait fixes

most errors left are missing localisation