quickpatch fix

some issues with mustache working, patched now