Rectify a lot of small things, insert missing files