sample data + fix bugs