Improve readme and template