Polly - glad you had a nice evening.
Sleepless - don't worry about the massage. Maybe fess up before you give her one start to pummel and be honest you don't know how to do proper massage. You could always suggest doing each other's feet. It's nice and relaxing, not too intimate, but you'll be facing each other so you can chat too.
Got the packing reference. Stuffed shorts etc...
As for strap-ons, that's a whole other ball game. Not sure I see the, ahem, point of them.