models + repository minor changes