Adding config options; Moving date arithmetic