Several enhancements, added loglevel...
Added template for mcomaster