Bug fixes and more specs.