Revisited the specs and tightened them

Specs improvements