Buffer addition, some debug config improvement