MAP-540: finish implementing label, more javadoc cleanup.