Advice - Yes,
1. Don't let them take your visa or license while dealing with you.
2. Write down any options you want added, exactly as you want - specify everything.
3. Have them write you an offer with the options on that paper and keep the copy when you leave.
(learned that last one the hard way)