Many fixes to supplications and still around 100 left to verify and check