text displacement expr : more re-factoring and various fixes