Improvments and new specs.