I'll take a look at shoring all that up as part of this branch. It's overdue for a spring clean.