Small improvements on the model, db and i18n