Collection interface, plus bug fixes