added categories to options, updated path generation to reflect CL changes