And more debug + bug fix