Changes to makefile and wip in general