fix folding if bugs
fix let binding bugs