making things better; commented out most trace statements