1. install catorise, it works properly and it automatically puts the applications you have installed in their proper folders.
2. had the same problem that you mention re: calendar with the leaked pr1.2. after i flashed to the official pr1.2 it worked. for me it was happening with the birthdays, and i had to go into each contact and edit the birthday field.