add special distance constraint for coincident and alignment, some cosmetic changes in the state parsers and uncomment pseudopoint code in solver