fixed unresolved questions