Patty,
I believe you are correct on the first and third raptures. The second is a little confusing due to the question about the timing of the two witnesses' departure, but you have IMO done well and this is a great presentation.
Thank You and God Bless
Alan T