Clean up some comments etc
Add new calendar ULR