Much-needed stability fixes, finished with #21.

And I got the right issue number this time, too.