update sbt, minor cleanup