removed/modified some print stmts