improve all specs