debug & improve