master build now
Fatal error with Dao fixed
several changes and area