some tweaks
keyboard support