added cli usage and updated templates