Documentation changes according to reviewer comments #118 and #119