Some fixes

Oh dear.

It's not time to fix folio2 yet. It's not done enough for fixes to mean anything. There's a fair chance that any fix performed right now will just get tossed on the scrap heap during a refactoring.

Lesson learned: don't stick things in public repos until I'm ready for someone besides me to care what's in them.

Give me a week or two and then it will make sense to fix things. Better yet, wait for me to merge it into the main folio repo and post a notice about it on my blog.