add debug & comments