Added targets for encipher simulation. Fixed minor problems.
More cleanup and fixes of fhe Makefile.