fix keyboard scroll, add return advancing

- ruben