New version and fixes