fix timing + cursor