Added content, style improvements, Makefile flags