merged Clanentries and some other stuff into the models