fixing external value change, fixing custom special character. cleaning code