I'd second/third Table Tutor from Scubatoys - Even if you are learning with your instructor, it will help keep your skills tuned. It has NAUI, PADI, SSI, and Navy tables in it - I still use it occassionally just to make sure I don't forget things...
Aloha, Tim
Aloha, Tim