renamed some counters
renamed some counters
improved prime-related methods
continued reformatting testSeptuples