updated cryptojs + minor changes