Fixed NPE + SINKJ 1.0! + More javadoc