More fixes, added data documentation