minor additions + added todo