Added Javadoc for DataActivity and removed some TODOs