Fixed constraint solver. It now merges sets. Added some extra code to the analysis show method.