Upgraded to scala 2.10, other small changes