add_tovar final fixes
beautify