Added Categorization Capabilities
Small bug fixes