More changes, scala 0.9.1