Early-morning bugfixes and tinkering. Maybe I should go to bed, now...