Add stronger support for SLP1

This includes 'P', 'B', and various bigrams.