Add enumerations, misc tweaks#1

zachlewis wants to merge 2 commits intoscottdyer:vwg-reorgscottdyer/CLF:vwg-reorgfrom

zachlewis:patch-1zachlewis/CLF:patch-1Copy head branch name to clipboard