minor
add missing license headers
rewrite data store objects