Added JavaDocs and removed a deprecated method.

Also added a comment where I intend to put a method soon.