mostly edits needed for new language version