(wip): various fixes for infinite loops