Js finished the new bug fix lemme know if there's still bugs