next core some fix & m