removing echos, adding comment stubs