Updated coverage and javadocs