major style and calendar updates, mostly sorted out +/- thing