lots more updates