general updates and corrections