New new commit
Some fixes
Updated the script