Show cursor simplify

now with fixes for the issues you found and without the merge commit