Some more documentation and testing