I don't see why Apple wouldn't do #1. It's pretty much the most requested feature/improvement.