wip Cleanups and minor fixups