Removing debug, fixing display