substantial refactoring and bugfixes, weight-based highlighting now working with new var-based models