fixed more syntax errors for wider support range