update and add fixes