Macdate 13

various internal