a little cleanup + working out categories reporting