Added java doc, made things look nicer,