Clean up adsistub file a bit (just spacing) and change over the crypto sub to use...