Some modifications to JavaDocs & small stuff