Four different improvements to 6960S. I put them in their own branches because they didn't all sync easily, hence the fm3. 155f saved in total.