Fixed bug and more specs.