Minor improvements, new version