complete closure*two; fix 2 bugs