[PATCH 00/12] various hurried changes / fixups