Fixing the template and updating the readme