bunch of improvements after Scala eXchange