update with fixes