emacs diary/calendar insert day (i-d)

[mr.sparkle]

hello!

1. The command insert entry (i-d) for diary/calendar always places the
   new entry at the bottom of the .diary file. Is there a way to make
   it insert entries in cronological order?

2. If you make two separate entries for the same day, you get two
   separate entries in .diary. What I would like, is when you execute
   i-d a second time on the same day, point would be placed in .diary
   on that day, rather than at the bottom of the file.

thanks!