update some fields
fix malformed </script>
refactor and simplify
fix typo