adds comments, removes some mtraces