clean up a lil
Have calendar work again