updated libraries, adapted code, code cleanups
scala 2.10.3, updated libraries