updated Makefile, still WIP and TODO