Fix bugs
Fix h2 overlap
Update