Include dir for headers
Mostly Makefile improvements but some WIP stuff too...