Added Cryptoine and some cleanups