More performance improvements.
Did a little bit of cleanup and added the project name to sbt.