Some fixes + new version