added Scala & comment changes