Added ability to define new names/categories
Fixed a stupid error