Fix break and tweak header