Added a few things and cleaned up some stuff

Added a few things from last night but mostly cleaning up traces and
adding parts to it.  Commit message last night was by Seto so ignore the
message.