Improviments on template and README