update formatting
fallback if translation isn't possible
small cleanup