fixed some error after changing database schema
modified schema structure and sample data