Fixed some constraint problems and recloned for updated GIT version