A lot of fixes
Finally finished all procedures usage