Tidied up date handling
Added a reference to Athletable