Changes to cam abstract extractor and some cosmetic changes