Updated JavaDoc and removed some old commented debug code