more fixes T_T