minor adds to TODO
fixes merge conflicts