updated scala and made some tweaks