Improve docs (closes #515)