Hi,
I'd like to suggest some more training material:
For those short of cash, there is a free ear training software that can be installed on Ubuntu Linux.
The name is "GNU Solfege". Definitely not as good looking as EarMaster.
If you want to train your ability to play tunes after listening to them, I can recommend a great book + CD kit:
"Das Ohrenbuch" (The Ear Book) by Jochen Pöhlert. I don't know if it exists in English, but you certainly don't have to learn German to be able to use the original.
It consists of 160 carefully selected tunes (mainly German, Russian, and English/American traditional songs), starting with easy pieces, then gradually moving to more difficult ones, always with an emphasis on important intervals and chord changes. Many times, the tunes are not complete, but extracts, so that you don't have to spend ages on a single one. The author asks you to first sing a tune, then play it in the key of C, and finally transpose it into several other keys. It is cumbersome, but very effective.