Minor changes 
Generate JavaDoc