add logging, remove some sbtOneJar settings, minor improvements
merge with dev