multiple fixes to models, representations and locales