Use non-arbitrary default date
Some performance improvements
More performance improvements