fixed escaping; name vars more consistently.