Some minor corrections, rspec pass.