Some fixes
Update version number