make check
some TODO notes