I dont think we will find out what happens to him until closer to the end of the season. At the end it didnt say "on the next episode" it said "this season" or some crap like that so it could be any time really.
I was so happy to see Claudia Joy come to peace about Amanda's death. I know it's something you never really get over, but it was wonderful to see her step out of her funk.