closes #1855
fix for wrapper
latest translations
closes #1862
closes #1864

doing andrew's //todo's since 1991