Improve checkout, javadocs