fixing formatting for checkout. fixing crash on switch.