Some improvements and upgrade to Akka 2.1.2