Fixed settings and history-date problem
Ready for presentation!