Quick exception fix and comment clean up