Updated many things