Some small fixes and tweaks -- everything works.