updates to documentation/comments
sort out merge