fixed calendar service and some refactor
refactor