* lots of additional work on the spi chapter
* some renaming for the spi chapter