Additional debug info and state reset logic