Changes discussed over skype

Added dynamic headers and might've fixed email - someone test this