Bugfixes, slowly debugging constraints
Fixing some more constraings bugs
Adding missing files