bugfix some holes in the human friendly naming, make sure we go back and plug missing holes, closes #31.