Better html output, fixed headshot calculation