added few TODO hints