bring the scala files up to date