Resourceful routes

This includes the changes Karen requested, plus changing the routes to be more resourceful. Most routes are unchanged, though I updated a few for consistency.