Add sample data, update scripts
More standardization