review fixes + added rebind test

-changes based on Sam's review on Gitter.
Delete commented out code, or justify why it is left in (with comments in code explaining when it would be useful to add back in).