Updated Readme and other minor updates in templates.