all done, except search, admin, and some route problems