updated composite data store; various fixes