new scala version and some small fixes