Added points and some fixes
Fixed makefile