headers extensions changed + some other small modifications