Improve docs, improve output