Rabbi Jager has published a sefer on the sugyos of Kiddush and Havdalah called Kiddushah Rabbah.  It is available in stores or by contacting him.