More bug fixes with calculator in regards to the way dates are handled