front end fix & comment