Again, string fixing + display fix