[WIP] more experimental fixups