Few updates and corrections