Small changes, worked on some rspec stuff