Make less ugly

And maybe some tiny fixes for different superusers.