removed some printf statements, added others