Spec cleanup

That. Specs could still use a lot more love, but this is a start.