A bit more work on the S-cores demo.