fixed calendar problem
modified report