small fixes, change escape to labescape to avoid name conflict