Improved documentation, test coverage