remove some debug code.  Add other categories.  Update titles for filters on equipment