added default header and removed temporary fixes, 'cause not the bugs are all fixed