calendar tweaks; optimize loading -- I think