Specupdate II

As long as you wish to take the updates step by step, this is another candidate for a merge.