Edited Scala to match forge

Edited Scala files