Added Gamma and Gamma with feedback (encryption not tested)
fixed some bugs, not enough