Added comments table
fixed conflicts in schema