More category improvements.