builds again, replaced a bunch of "int i;"