fixed remaining bugs; now actually done