Cleanup some things + add debug log
FIX SHIT