better headers + data handling