Updated Everything some more