Improve commenting
fix merge conflicts
rob fixed it