expanded and cleaned

does not compile yet.

added: measurement sensitivity, legit usage of one-time measurements,
more intuitive address setup

fixed: some messy and superfluous code