Some stateless improvements and more work on SPI tutorial stateless