Fixed one or two fairly frequent exceptions, and worked on the simplifier a bit. I added the ability to add in the implied 1's. Nothing special.