added scala syntax/etc, removed easymotion