Makefile Polish + updates
Makefile shuffle