Restore articulation functions #196

Cleaned constraints

They are still *awful*, we have to find a better way of doing this...