added a few comments
fixed conflicts