fixed bugs with Google Calendar

added userId from the identity of the logged user, improved quality of
the code