Adding javadoc and UI enhancements