Makefile cleanup, fixed x64, pfa soon