Some improvements on Store and Dom.