Fixed makefile
Improved core