escape/number fixes