Better keyboard support + session bug fix