re-organized the categories a bit