Added headshot and some minor changes