Calendar Update

Size modified slightly. Other tests still under way including Volker's
shadows.