More que specs
Fixes cive and the like
More specs