Fixed mistakes in combine

Retaining weight order of list
Not using recursion
Tests for until