added new categories

also some housekeeping