Readme and some template changes