some changes
fixed conflicts
Lots of stuff
fixed conflicts