Improve coverage and add more docs