Updating some documentation for #24 and #37