Escape bug fix and few tweaks