Added CFlags var to makefile, and cleanups, some lib. updates