added puppet syntax, auto folding and bce fix