done with fixes