Javadoc fixes
Changed ChatWatcher, and added modified KeyManager