Put data store back on root scope. Bug fixes.