Fix !end
Fix key binding