inspection, old code deleted, some fixes - DAO revisited