little bit of reorg, cleaned up categories