updated checks and added missing html