more fixes still not sure