Improved spec a little (especially the config spec).