new version, bug fixes