changes to several categories

@rodrigopavezi please review.