fixes - localization - cosmetics