Bunch of comment cleanup and trace work!