updated ways file, added a lot to DataParser