Add categorization — small tweaks