fix keyboard handling, and marker updates