Merge in updated specs and other small changes.