Doc update. Closes #125 and closes #135