Add in some changes from maz's cryptico fork