add some statement fixes; add more conversion rules from ES3