merge of the prox branch into the grad branch. Deletion of the kwargs and prox branch