Improve overlay

* also re-add debug text