fixed makefile for stdc++ lib
Fixed errors with counts etc
Cleaned up makefile