Fixed timeout and javadocs.