zbar, fixed up a bit.