fix header on top
fix some closure warning