Changes done during Klarna

Updates done during working at Klarna.