Updated Comments, Improved Rendering