Assorted improvements and tweaques.