Updated to new version, minor fixes