Added indicators on the dates.
Cleanup unused and debug functions.