Fix specs. Tidy up a bit.