misc fixes

escape was broken