- regex improve, add some todo
- merge