error fixs, 2 remain