Fixes heading bug, adds helpers