Speech improvements

I don't know what went on with all that merging and fixing, but I assume it's all resolved now. I finished what I was doing, so we should be ready to merge this, right?