MIMI + util client, assorted cleanups