A few more updates (almost done)