added traces in print table and set wait correctly