date fixes and calendar fixes