Updates as per several notes/requests in the PR
Updates as per several notes/requests in the PR

Comments added where discussion is still going on.

knod/cliff-effects-1,codeforboston/cliff-effects,scapp281/cliff-effects,scapp281/cliff-effects,shp54/cliff-effects,shp54/cliff-effects,knod/cliff-effects-1,codeforboston/cliff-effects