Junebug, I am really glad that things have been better (Roses? I'll say they're better!) and that he's planning on coming home. Great! I do think that eventually the two of you are going to have to work out some agreement about how you spend your time on weekends. But I'd say that for now, wait a while and let the good feelings between you grow. Once he's certain he wants to come home, it's time for a solution-oriented discussion about expectations. You can get some help on that by re-reading Step #3- Ask for what you want.
But it sounds as if you're on a roll, and that's great. Keep up the great work. Michele
