Cleaning up nomenclature, re-adding Bindable setup

Fixing a mix up in the branches

Format fixes only in core.py