Various fixes. I think. And possibly add a icon?