updated to restore a couple logging points, and give the crypto libraries switchable