category editing and minor changes