A little more fixes
Zipped new version