SWOS-127 SWOS-129 SWOS-130

language stuff update