Fixed issues suggested in the email. Except the one related to visitorId