more tweaks and scala stuff