Thanks so much for your help. The only other thing I've ran into a problem with is...

я жду самолёта/поезда/автобуса

The Rosetta Stone program uses this but for the life of me I can't see why as the accusative (object of what I am waiting for) is simply the same as the nominative (as they are all masculine nouns). Why is the genitive case being used?