Some minor fixes and a non working Makefile, just a early draft