updated rspec and fixed tiny bugs discovered in the process.