fixes
leftovers
return escapes