Some minor changes -> removed debug printing.