Fixing some issues with the header and stuff