Added sbt, bugfixes