Fix comments, make  dynamic