Added a couple more, link and time fixes