Doc fixes
Now with Makefile
Merge branch 'full-idi'