WIP - More fixups.

-=david=-