more style fixes
build tools
use template files
IT BUILDS