Clean, fix AES AuthenticateHost and change logic