Do not explode the world!
JavaDoc additions and fixes
Comment fixes and cleanup