Macdate 21

Various internal