More minor updates and labeling fixes

Added Cap values and version number