some fix's