Category updates

I'm messing with category positions for the next few hours. Don't be surprised if things move around.

Alan