removed some print statements, etc.