adding further changes from David and the new cryptokit docs