Macdate 5

A few coding changes