More stuff and a fix

It's been a while.
Have to learn, somehow.