[spyro] Numerous small changes and 30 or so new lines.