Where apple should go with the ipod touch and the iphone

Where apple should go with the ipod touch and the iphone.
Both the ipod touch and the iphone have touch screens. It would be quite logical to give them a note-taking application, like tablet PCs, which would be great for students who do not want to pay for both an ipod and a tablet PC.
Another thing they should have is a place where you can download new software to put on the ipod touch/iphone. Some of the software would be free, others you would pay for using your itunes account. If the software avaliable included document and spreadsheet editors, it could make both devices a good pda replacement (having them function as a pda would also make them seem a like a much better deal).
With the note-taking ability and the software improvement combined with the wifi, music ability, and web browser, the ipod touch could replace:

1. An ipod (duh)
   
2. A PDA
   
3. ..and possibly even a tablet PC
   

Given the above improvements, the iphone could replace:

1. Again, an ipod
2. A PDA
3. A cellphone
4. A point-and-shoot digital camera
5. ..and possibly even a tablet PC

Now imagine if apple gave the iphone and ipod touch 3d gaming on par with a Sony PSP or Nintendo DS...