FIX MEGABUG and add debug info