Added much better keyboard support.