review fixes + added rebind test

-changes based on Sam's review on Gitter.