Weighting schemes; bugfixes; testing schemes.