JavaDoc updated and spelling changes