Clear out old comments; touch up plotting