Javadoc fixes
Custom Console should not be in ARS
Use the correct HashMap