last update with fixes