some improvements in template and README