modes cleaned and CFB mode added (not tested)