Show selection through underlining
Minor refactor in state
Fix comment plugin