Further changes made to the cryptosystem

However, the demo is still returning an invalid cyphercheck, while
require further testing/debugging.