NF: added todo
BF: fix bad variable name