Updating

Adding all the updates that Nicco has done.