Updated many more things