date calcs, color improvments