Cleanup, fixed warnings, recreated lost data directory