Lots of work on spi and some map changes