Updated comments, suppresswarnings.