Added subtraction of days and addition of week/weeks