Added PCPLUS and PCMINUS to scanner and moved some tokens around for better organization