almost done with fixes