Added final things. All set I think.