update syntax folding and a few other things