categories enhanced again...still a few things to do