misc. changes.  removed debug statements.