better comments, move patch