a number of bugfixes, also headers are back