massive improvings and migrating to eval_gettext