Yes, I got a lot better as time went on - the overflow was from the first three of the five rackings I did. I didn't get any during the last two (yay!). Thanks for the tips.
Although the sangria-like treat the end, well who can really complain...