0.9 version, minor fixes