final updates to zxing