updating with fixes