added type annotation to class javadoc
better javadoc for enums
extra options for Choice and Choices concat
improved server listing