devilfox: added the near final changes