merged bugfixes
Adjusted headers