cleaned up stuff
atMostOne constraints added