Events calendar and some fixes

Eve