added back suppress template warnings and changed makefile