Suite Core -> corrections + debug