added rspec and more