scrolling fix, key handling improvements