Spec fixes and organization