more updates all over the place