correct path to data dir
correct class name
various fixes
various fixes