Changes per feedback including untranslatable stuff and failing specs!