some updates and corrections