Several more updates