Updating categories, other changes and enhancements