[spyro] A few minor fixes and another 25 or so lines.