Small changes, add debug code ( for the blank screen issue )