Change default template a bit and fix help command documentation