Some more updates and corrections