latest updates
a couple of fixes
mason templates