added some JavaDoc

and removed some junk