Added flash messages, more checkout work