Updated c++ FK to be correct and made makefile work on mac