modify rspec and routes and finish the 1st and 2nd question