Fix comments and add Draw Lines