Fix global vars
Update version