Stuffing it with debugging...  And maybe fixing a few bugs...