fixed all remaining parser