#6 added missing entities, proceeding to DAOs
other minor changes, committed
other minor changes, committed