add todos
fail more appropriately. fix runners