Fixing some bugs and sample_data