fix painting + fix Dao