Fixed most of the Spec problems