Bugfixes, adjusted headers