Installation fixes.
Small makefile fixes.
Put back demo.