added comments
fixed merge conflicts