whoops, unnecessary repeat
switch from confusing 'labels' to 'cats'; various small improvements

Fixes #5, sort of.