Changes to the spec script based on comments from @danielsdeleo