fixing some /pre-translation issues

and a logical flaw