Bug-Fixing, Added Java Docs