weighted -> labeled
a few cleanups from the weight conversion