Add some TODO notations
Fix Makefile broken by rust