Tidied up vars comments and made registration IP explicit to work around check issues (particular on CC)