Macdate 6

Various changes to coding