minor updates and name changes (bored at the airport for a few mins)