fixed all promised core bugs