JavaDoc updated to be most recent and correct