Several updates to many things