improve debug
More debugging