fixed dataStore, added javadoc-comments