small fixes, moving strip-specific code out of spi.h/c