Category Small Wins

Little improvements worth noticing.