small improvements and new version