adding a few comments
merging