Final updates

Should be all done (yeah right)