review fixes + added rebind test