added some more problems
fixed conflicts