Moved args into zbar calling scripts and other minor changes.