split the shared specs
Fixed random stuff that should have been fixed some commits ago